Auto merge of #1867 - alex:patch-1, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 3 Aug 2015 01:22:36 +0000 (01:22 +0000)
committerbors <bors@rust-lang.org>
Mon, 3 Aug 2015 01:22:36 +0000 (01:22 +0000)
commit14c05358de8e08ed4884944b8bf0cc6c33d8bfc9
treeadb529eb87562a1f5c90fe76e4aead9060a5f036
parent3eb04414dcb2bcff94e26794f5ff398230b9e669
parentb186d2f5ae2ad958b50d85936214cbc9afb58f07
Auto merge of #1867 - alex:patch-1, r=alexcrichton